@@ -1,5 +1,11 @@
Version history for MooseX::Method::Signatures
+0.31 Thu, 01 Jun 2010 13:47:34 -0300
+ * Add support for "does" as a trait declarator
+ * Compatibilize MXMS::Meta::Method signature with Class::MOP::Method
+ so other traits can apply customizations to the actual body of the
+ method.
+
0.30 Thu, 04 Feb 2010 02:41:36 +0100
* Make Any instead of Defined the default type constraint.
* Add tests for coercing optional named parameters (Cory Watson).
@@ -32,8 +32,10 @@ t/lib/My/Annoyingly/Long/Name/Space.pm
t/lib/Redefined.pm
t/lib/TestClass.pm
t/lib/TestClassTrait.pm
+t/lib/TestClassWithMxTypes.pm
t/list.t
t/meta.t
+t/method-trait.t
t/named_defaults.t
t/no_signature.t
t/placeholders.t
@@ -43,8 +45,12 @@ t/return_value.t
t/signatures.t
t/sigs-optional.t
t/structured.t
+t/synopsis.t
t/too_many_args.t
t/traits.t
t/type_alias.t
t/types.t
+t/undef_method_arg.t
+t/where.t
xt/author/pod.t
+xt/author/transactional-authorized.t
@@ -9,7 +9,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.92'
+generated_by: 'Module::Install version 0.97'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -41,4 +41,4 @@ resources:
bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=MooseX-Method-Signatures
license: http://dev.perl.org/licenses/
repository: git://github.com/rafl/moosex-method-signatures.git
-version: 0.30
+version: 0.31
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
}
# Suspend handler for "redefined" warnings
@@ -51,13 +51,18 @@ sub admin {
#line 106
sub is_admin {
- $_[0]->admin->VERSION;
+ ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
}
sub DESTROY {}
package Module::Install::Base::FakeAdmin;
+use vars qw{$VERSION};
+BEGIN {
+ $VERSION = $Module::Install::Base::VERSION;
+}
+
my $fake;
sub new {
@@ -75,4 +80,4 @@ BEGIN {
1;
-#line 154
+#line 159
@@ -9,7 +9,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -6,46 +6,60 @@ package Module::Install::ExtraTests;
use Module::Install::Base;
BEGIN {
- our $VERSION = '0.006';
+ our $VERSION = '0.007';
our $ISCORE = 1;
our @ISA = qw{Module::Install::Base};
}
+our $use_extratests = 0;
+
sub extra_tests {
my ($self) = @_;
return unless -d 'xt';
- return unless my @content = grep { $_ =~ /^[.]/ } <xt/*>;
+ return unless my @content = grep { $_ !~ /^[.]/ } <xt/*>;
- die "unknown files found in ./xt" if grep { -f } @content;
+ die "unknown files found in ./xt" if grep { !-d } @content;
- my %known = map {; $_ => 1 } qw(author smoke release);
+ my %known = map {; "xt/$_" => 1 } qw(author smoke release);
my @unknown = grep { not $known{$_} } @content;
die "unknown directories found in ./xt: @unknown" if @unknown;
- {
- no warnings qw(closure once);
- package # The newline tells PAUSE, "DO NOT INDEXING!"
- MY;
- sub test_via_harness {
- my ($self, $perl, $tests) = @_;
- my $a_str = -d 'xt/author' ? 'xt/author' : '';
- my $r_str = -d 'xt/release' ? 'xt/release' : '';
- my $s_str = -d 'xt/smoke' ? 'xt/smoke' : '';
- my $is_author = $Module::Install::AUTHOR ? 1 : 0;
-
- return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" }
- . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n};
- }
-
- sub dist_test {
- my ($self, @args) = @_;
- my $text = $self->SUPER::dist_test(@args);
- my @lines = split /\n/, $text;
- $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines;
- return join "\n", @lines;
- }
+ $use_extratests = 1;
+
+ return;
+}
+
+{
+ no warnings qw(once);
+ package # The newline tells PAUSE, "DO NOT INDEXING!"
+ MY;
+ sub test_via_harness {
+ my $self = shift;
+
+ return $self->SUPER::test_via_harness(@_)
+ unless $use_extratests;
+
+ my ($perl, $tests) = @_;
+ my $a_str = -d 'xt/author' ? 'xt/author' : '';
+ my $r_str = -d 'xt/release' ? 'xt/release' : '';
+ my $s_str = -d 'xt/smoke' ? 'xt/smoke' : '';
+ my $is_author = $Module::Install::AUTHOR ? 1 : 0;
+
+ return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" }
+ . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n};
+ }
+
+ sub dist_test {
+ my ($self, @args) = @_;
+
+ return $self->SUPER::dist_test(@args)
+ unless $use_extratests;
+ my $text = $self->SUPER::dist_test(@args);
+ my @lines = split /\n/, $text;
+ $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines;
+ return join "\n", @lines;
}
}
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -7,7 +7,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -25,8 +25,8 @@ sub prompt {
die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
}
- # In automated testing, always use defaults
- if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+ # In automated testing or non-interactive session, always use defaults
+ if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
local $ENV{PERL_MM_USE_DEFAULT} = 1;
goto &ExtUtils::MakeMaker::prompt;
} else {
@@ -45,10 +45,90 @@ sub makemaker {
( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
}
+# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
+# as we only need to know here whether the attribute is an array
+# or a hash or something else (which may or may not be appendable).
+my %makemaker_argtype = (
+ C => 'ARRAY',
+ CONFIG => 'ARRAY',
+# CONFIGURE => 'CODE', # ignore
+ DIR => 'ARRAY',
+ DL_FUNCS => 'HASH',
+ DL_VARS => 'ARRAY',
+ EXCLUDE_EXT => 'ARRAY',
+ EXE_FILES => 'ARRAY',
+ FUNCLIST => 'ARRAY',
+ H => 'ARRAY',
+ IMPORTS => 'HASH',
+ INCLUDE_EXT => 'ARRAY',
+ LIBS => 'ARRAY', # ignore ''
+ MAN1PODS => 'HASH',
+ MAN3PODS => 'HASH',
+ META_ADD => 'HASH',
+ META_MERGE => 'HASH',
+ PL_FILES => 'HASH',
+ PM => 'HASH',
+ PMLIBDIRS => 'ARRAY',
+ PMLIBPARENTDIRS => 'ARRAY',
+ PREREQ_PM => 'HASH',
+ CONFIGURE_REQUIRES => 'HASH',
+ SKIP => 'ARRAY',
+ TYPEMAPS => 'ARRAY',
+ XS => 'HASH',
+# VERSION => ['version',''], # ignore
+# _KEEP_AFTER_FLUSH => '',
+
+ clean => 'HASH',
+ depend => 'HASH',
+ dist => 'HASH',
+ dynamic_lib=> 'HASH',
+ linkext => 'HASH',
+ macro => 'HASH',
+ postamble => 'HASH',
+ realclean => 'HASH',
+ test => 'HASH',
+ tool_autosplit => 'HASH',
+
+ # special cases where you can use makemaker_append
+ CCFLAGS => 'APPENDABLE',
+ DEFINE => 'APPENDABLE',
+ INC => 'APPENDABLE',
+ LDDLFLAGS => 'APPENDABLE',
+ LDFROM => 'APPENDABLE',
+);
+
sub makemaker_args {
- my $self = shift;
+ my ($self, %new_args) = @_;
my $args = ( $self->{makemaker_args} ||= {} );
- %$args = ( %$args, @_ );
+ foreach my $key (keys %new_args) {
+ if ($makemaker_argtype{$key}) {
+ if ($makemaker_argtype{$key} eq 'ARRAY') {
+ $args->{$key} = [] unless defined $args->{$key};
+ unless (ref $args->{$key} eq 'ARRAY') {
+ $args->{$key} = [$args->{$key}]
+ }
+ push @{$args->{$key}},
+ ref $new_args{$key} eq 'ARRAY'
+ ? @{$new_args{$key}}
+ : $new_args{$key};
+ }
+ elsif ($makemaker_argtype{$key} eq 'HASH') {
+ $args->{$key} = {} unless defined $args->{$key};
+ foreach my $skey (keys %{ $new_args{$key} }) {
+ $args->{$key}{$skey} = $new_args{$key}{$skey};
+ }
+ }
+ elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
+ $self->makemaker_append($key => $new_args{$key});
+ }
+ }
+ else {
+ if (defined $args->{$key}) {
+ warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
+ }
+ $args->{$key} = $new_args{$key};
+ }
+ }
return $args;
}
@@ -58,8 +138,8 @@ sub makemaker_append {
my $self = shift;
my $name = shift;
my $args = $self->makemaker_args;
- $args->{name} = defined $args->{$name}
- ? join( ' ', $args->{name}, @_ )
+ $args->{$name} = defined $args->{$name}
+ ? join( ' ', $args->{$name}, @_ )
: join( ' ', @_ );
}
@@ -100,25 +180,22 @@ sub inc {
$self->makemaker_args( INC => shift );
}
-my %test_dir = ();
-
sub _wanted_t {
- /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
}
sub tests_recursive {
my $self = shift;
- if ( $self->tests ) {
- die "tests_recursive will not work if tests are already defined";
- }
my $dir = shift || 't';
unless ( -d $dir ) {
die "tests_recursive dir '$dir' does not exist";
}
- %test_dir = ();
+ my %tests = map { $_ => 1 } split / /, ($self->tests || '');
require File::Find;
- File::Find::find( \&_wanted_t, $dir );
- $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
+ File::Find::find(
+ sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
+ $dir
+ );
+ $self->tests( join ' ', sort keys %tests );
}
sub write {
@@ -155,17 +232,36 @@ sub write {
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
- $args->{VERSION} = $self->version;
$args->{NAME} =~ s/-/::/g;
+ $args->{VERSION} = $self->version or die <<'EOT';
+ERROR: Can't determine distribution version. Please specify it
+explicitly via 'version' in Makefile.PL, or set a valid $VERSION
+in a module, and provide its file path via 'version_from' (or
+'all_from' if you prefer) in Makefile.PL.
+EOT
+
+ $DB::single = 1;
if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
+ my @tests = split ' ', $self->tests;
+ my %seen;
+ $args->{test} = {
+ TESTS => (join ' ', grep {!$seen{$_}++} @tests),
+ };
+ } elsif ( $Module::Install::ExtraTests::use_extratests ) {
+ # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
+ # So, just ignore our xt tests here.
+ } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+ $args->{test} = {
+ TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
+ };
}
if ( $] >= 5.005 ) {
$args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
+ $args->{AUTHOR} = join ', ', @{$self->author || []};
}
if ( $self->makemaker(6.10) ) {
- $args->{NO_META} = 1;
+ $args->{NO_META} = 1;
+ #$args->{NO_MYMETA} = 1;
}
if ( $self->makemaker(6.17) and $self->sign ) {
$args->{SIGN} = 1;
@@ -173,6 +269,9 @@ sub write {
unless ( $self->is_admin ) {
delete $args->{SIGN};
}
+ if ( $self->makemaker(6.31) and $self->license ) {
+ $args->{LICENSE} = $self->license;
+ }
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
@@ -197,13 +296,22 @@ sub write {
# Remove any reference to perl, BUILD_REQUIRES doesn't support it
delete $args->{BUILD_REQUIRES}->{perl};
- # Delete bundled dists from prereq_pm
- my $subdirs = ($args->{DIR} ||= []);
+ # Delete bundled dists from prereq_pm, add it to Makefile DIR
+ my $subdirs = ($args->{DIR} || []);
if ($self->bundles) {
+ my %processed;
foreach my $bundle (@{ $self->bundles }) {
- my ($file, $dir) = @$bundle;
- push @$subdirs, $dir if -d $dir;
- delete $build_prereq->{$file}; #Delete from build prereqs only
+ my ($mod_name, $dist_dir) = @$bundle;
+ delete $prereq->{$mod_name};
+ $dist_dir = File::Basename::basename($dist_dir); # dir for building this module
+ if (not exists $processed{$dist_dir}) {
+ if (-d $dist_dir) {
+ # List as sub-directory to be processed by make
+ push @$subdirs, $dist_dir;
+ }
+ # Else do nothing: the module is already present on the system
+ $processed{$dist_dir} = undef;
+ }
}
}
@@ -222,12 +330,17 @@ sub write {
}
}
- $args->{INSTALLDIRS} = $self->installdirs;
+ if ($self->installdirs) {
+ warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
+ $args->{INSTALLDIRS} = $self->installdirs;
+ }
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+ my %args = map {
+ ( $_ => $args->{$_} ) } grep {defined($args->{$_} )
+ } keys %$args;
my $user_preop = delete $args{dist}->{PREOP};
- if (my $preop = $self->admin->preop($user_preop)) {
+ if ( my $preop = $self->admin->preop($user_preop) ) {
foreach my $key ( keys %$preop ) {
$args{dist}->{$key} = $preop->{$key};
}
@@ -297,4 +410,4 @@ sub postamble {
__END__
-#line 426
+#line 539
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -19,7 +19,6 @@ my @scalar_keys = qw{
name
module_name
abstract
- author
version
distribution_type
tests
@@ -43,8 +42,11 @@ my @resource_keys = qw{
my @array_keys = qw{
keywords
+ author
};
+*authors = \&author;
+
sub Meta { shift }
sub Meta_BooleanKeys { @boolean_keys }
sub Meta_ScalarKeys { @scalar_keys }
@@ -176,43 +178,6 @@ sub perl_version {
$self->{values}->{perl_version} = $version;
}
-#Stolen from M::B
-my %license_urls = (
- perl => 'http://dev.perl.org/licenses/',
- apache => 'http://apache.org/licenses/LICENSE-2.0',
- artistic => 'http://opensource.org/licenses/artistic-license.php',
- artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php',
- lgpl => 'http://opensource.org/licenses/lgpl-license.php',
- lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php',
- lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html',
- bsd => 'http://opensource.org/licenses/bsd-license.php',
- gpl => 'http://opensource.org/licenses/gpl-license.php',
- gpl2 => 'http://opensource.org/licenses/gpl-2.0.php',
- gpl3 => 'http://opensource.org/licenses/gpl-3.0.html',
- mit => 'http://opensource.org/licenses/mit-license.php',
- mozilla => 'http://opensource.org/licenses/mozilla1.1.php',
- open_source => undef,
- unrestricted => undef,
- restrictive => undef,
- unknown => undef,
-);
-
-sub license {
- my $self = shift;
- return $self->{values}->{license} unless @_;
- my $license = shift or die(
- 'Did not provide a value to license()'
- );
- $self->{values}->{license} = $license;
-
- # Automatically fill in license URLs
- if ( $license_urls{$license} ) {
- $self->resources( license => $license_urls{$license} );
- }
-
- return 1;
-}
-
sub all_from {
my ( $self, $file ) = @_;
@@ -230,7 +195,7 @@ sub all_from {
die("The path '$file' does not exist, or is not a file");
}
- $self->{values}{all_from} = $file;
+ $self->{values}{all_from} = $file;
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
@@ -242,7 +207,7 @@ sub all_from {
$self->name_from($file) unless $self->name;
$self->version_from($file) unless $self->version;
$self->perl_version_from($file) unless $self->perl_version;
- $self->author_from($pod) unless $self->author;
+ $self->author_from($pod) unless @{$self->author || []};
$self->license_from($pod) unless $self->license;
$self->abstract_from($pod) unless $self->abstract;
@@ -352,6 +317,9 @@ sub version_from {
require ExtUtils::MM_Unix;
my ( $self, $file ) = @_;
$self->version( ExtUtils::MM_Unix->parse_version($file) );
+
+ # for version integrity check
+ $self->makemaker_args( VERSION_FROM => $file );
}
sub abstract_from {
@@ -362,7 +330,7 @@ sub abstract_from {
{ DISTNAME => $self->name },
'ExtUtils::MM_Unix'
)->parse_abstract($file)
- );
+ );
}
# Add both distribution and module name
@@ -428,53 +396,146 @@ sub author_from {
([^\n]*)
/ixms) {
my $author = $1 || $2;
- $author =~ s{E<lt>}{<}g;
- $author =~ s{E<gt>}{>}g;
+
+ # XXX: ugly but should work anyway...
+ if (eval "require Pod::Escapes; 1") {
+ # Pod::Escapes has a mapping table.
+ # It's in core of perl >= 5.9.3, and should be installed
+ # as one of the Pod::Simple's prereqs, which is a prereq
+ # of Pod::Text 3.x (see also below).
+ $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+ {
+ defined $2
+ ? chr($2)
+ : defined $Pod::Escapes::Name2character_number{$1}
+ ? chr($Pod::Escapes::Name2character_number{$1})
+ : do {
+ warn "Unknown escape: E<$1>";
+ "E<$1>";
+ };
+ }gex;
+ }
+ elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
+ # Pod::Text < 3.0 has yet another mapping table,
+ # though the table name of 2.x and 1.x are different.
+ # (1.x is in core of Perl < 5.6, 2.x is in core of
+ # Perl < 5.9.3)
+ my $mapping = ($Pod::Text::VERSION < 2)
+ ? \%Pod::Text::HTML_Escapes
+ : \%Pod::Text::ESCAPES;
+ $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+ {
+ defined $2
+ ? chr($2)
+ : defined $mapping->{$1}
+ ? $mapping->{$1}
+ : do {
+ warn "Unknown escape: E<$1>";
+ "E<$1>";
+ };
+ }gex;
+ }
+ else {
+ $author =~ s{E<lt>}{<}g;
+ $author =~ s{E<gt>}{>}g;
+ }
$self->author($author);
} else {
warn "Cannot determine author info from $_[0]\n";
}
}
+#Stolen from M::B
+my %license_urls = (
+ perl => 'http://dev.perl.org/licenses/',
+ apache => 'http://apache.org/licenses/LICENSE-2.0',
+ apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1',
+ artistic => 'http://opensource.org/licenses/artistic-license.php',
+ artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php',
+ lgpl => 'http://opensource.org/licenses/lgpl-license.php',
+ lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php',
+ lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html',
+ bsd => 'http://opensource.org/licenses/bsd-license.php',
+ gpl => 'http://opensource.org/licenses/gpl-license.php',
+ gpl2 => 'http://opensource.org/licenses/gpl-2.0.php',
+ gpl3 => 'http://opensource.org/licenses/gpl-3.0.html',
+ mit => 'http://opensource.org/licenses/mit-license.php',
+ mozilla => 'http://opensource.org/licenses/mozilla1.1.php',
+ open_source => undef,
+ unrestricted => undef,
+ restrictive => undef,
+ unknown => undef,
+);
+
+sub license {
+ my $self = shift;
+ return $self->{values}->{license} unless @_;
+ my $license = shift or die(
+ 'Did not provide a value to license()'
+ );
+ $license = __extract_license($license) || lc $license;
+ $self->{values}->{license} = $license;
+
+ # Automatically fill in license URLs
+ if ( $license_urls{$license} ) {
+ $self->resources( license => $license_urls{$license} );
+ }
+
+ return 1;
+}
+
sub _extract_license {
- if (
- $_[0] =~ m/
- (
- =head \d \s+
- (?:licen[cs]e|licensing|copyrights?|legal)\b
- .*?
- )
- (=head\\d.*|=cut.*|)
- \z
- /ixms ) {
- my $license_text = $1;
- my @phrases = (
- 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
- 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
- 'GNU general public license' => 'gpl', 1,
- 'GNU public license' => 'gpl', 1,
- 'GNU lesser general public license' => 'lgpl', 1,
- 'GNU lesser public license' => 'lgpl', 1,
- 'GNU library general public license' => 'lgpl', 1,
- 'GNU library public license' => 'lgpl', 1,
- 'BSD license' => 'bsd', 1,
- 'Artistic license' => 'artistic', 1,
- 'GPL' => 'gpl', 1,
- 'LGPL' => 'lgpl', 1,
- 'BSD' => 'bsd', 1,
- 'Artistic' => 'artistic', 1,
- 'MIT' => 'mit', 1,
- 'proprietary' => 'proprietary', 0,
- );
- while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
- $pattern =~ s#\s+#\\s+#gs;
- if ( $license_text =~ /\b$pattern\b/i ) {
- return $license;
- }
+ my $pod = shift;
+ my $matched;
+ return __extract_license(
+ ($matched) = $pod =~ m/
+ (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
+ (=head \d.*|=cut.*|)\z
+ /xms
+ ) || __extract_license(
+ ($matched) = $pod =~ m/
+ (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
+ (=head \d.*|=cut.*|)\z
+ /xms
+ );
+}
+
+sub __extract_license {
+ my $license_text = shift or return;
+ my @phrases = (
+ '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
+ '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'Artistic and GPL' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
+ 'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
+ 'GNU Free Documentation license' => 'unrestricted', 1,
+ 'GNU Affero General Public License' => 'open_source', 1,
+ '(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'Apache (?:Software )?license' => 'apache', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'Mozilla Public License' => 'mozilla', 1,
+ 'Q Public License' => 'open_source', 1,
+ 'OpenSSL License' => 'unrestricted', 1,
+ 'SSLeay License' => 'unrestricted', 1,
+ 'zlib License' => 'open_source', 1,
+ 'proprietary' => 'proprietary', 0,
+ );
+ while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
+ $pattern =~ s#\s+#\\s+#gs;
+ if ( $license_text =~ /\b$pattern\b/i ) {
+ return $license;
}
- } else {
- return;
}
+ return '';
}
sub license_from {
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.97';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';;
+ $VERSION = '0.97';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -26,7 +26,10 @@ sub WriteAll {
$self->check_nmake if $args{check_nmake};
unless ( $self->makemaker_args->{PL_FILES} ) {
- $self->makemaker_args( PL_FILES => {} );
+ # XXX: This still may be a bit over-defensive...
+ unless ($self->makemaker(6.25)) {
+ $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
+ }
}
# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
@@ -19,6 +19,10 @@ package Module::Install;
use 5.005;
use strict 'vars';
+use Cwd ();
+use File::Find ();
+use File::Path ();
+use FindBin;
use vars qw{$VERSION $MAIN};
BEGIN {
@@ -28,7 +32,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.92';
+ $VERSION = '0.97';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -38,18 +42,25 @@ BEGIN {
}
+sub import {
+ my $class = shift;
+ my $self = $class->new(@_);
+ my $who = $self->_caller;
-
-
-
-# Whether or not inc::Module::Install is actually loaded, the
-# $INC{inc/Module/Install.pm} is what will still get set as long as
-# the caller loaded module this in the documented manner.
-# If not set, the caller may NOT have loaded the bundled version, and thus
-# they may not have a MI version that works with the Makefile.PL. This would
-# result in false errors or unexpected behaviour. And we don't want that.
-my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
-unless ( $INC{$file} ) { die <<"END_DIE" }
+ #-------------------------------------------------------------
+ # all of the following checks should be included in import(),
+ # to allow "eval 'require Module::Install; 1' to test
+ # installation of Module::Install. (RT #51267)
+ #-------------------------------------------------------------
+
+ # Whether or not inc::Module::Install is actually loaded, the
+ # $INC{inc/Module/Install.pm} is what will still get set as long as
+ # the caller loaded module this in the documented manner.
+ # If not set, the caller may NOT have loaded the bundled version, and thus
+ # they may not have a MI version that works with the Makefile.PL. This would
+ # result in false errors or unexpected behaviour. And we don't want that.
+ my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
+ unless ( $INC{$file} ) { die <<"END_DIE" }
Please invoke ${\__PACKAGE__} with:
@@ -61,26 +72,28 @@ not:
END_DIE
-
-
-
-
-# If the script that is loading Module::Install is from the future,
-# then make will detect this and cause it to re-run over and over
-# again. This is bad. Rather than taking action to touch it (which
-# is unreliable on some platforms and requires write permissions)
-# for now we should catch this and refuse to run.
-if ( -f $0 ) {
- my $s = (stat($0))[9];
-
- # If the modification time is only slightly in the future,
- # sleep briefly to remove the problem.
- my $a = $s - time;
- if ( $a > 0 and $a < 5 ) { sleep 5 }
-
- # Too far in the future, throw an error.
- my $t = time;
- if ( $s > $t ) { die <<"END_DIE" }
+ # This reportedly fixes a rare Win32 UTC file time issue, but
+ # as this is a non-cross-platform XS module not in the core,
+ # we shouldn't really depend on it. See RT #24194 for detail.
+ # (Also, this module only supports Perl 5.6 and above).
+ eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
+
+ # If the script that is loading Module::Install is from the future,
+ # then make will detect this and cause it to re-run over and over
+ # again. This is bad. Rather than taking action to touch it (which
+ # is unreliable on some platforms and requires write permissions)
+ # for now we should catch this and refuse to run.
+ if ( -f $0 ) {
+ my $s = (stat($0))[9];
+
+ # If the modification time is only slightly in the future,
+ # sleep briefly to remove the problem.
+ my $a = $s - time;
+ if ( $a > 0 and $a < 5 ) { sleep 5 }
+
+ # Too far in the future, throw an error.
+ my $t = time;
+ if ( $s > $t ) { die <<"END_DIE" }
Your installer $0 has a modification time in the future ($s > $t).
@@ -89,15 +102,12 @@ This is known to create infinite loops in make.
Please correct this, then run $0 again.
END_DIE
-}
-
-
-
+ }
-# Build.PL was formerly supported, but no longer is due to excessive
-# difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
+ # Build.PL was formerly supported, but no longer is due to excessive
+ # difficulty in implementing every single feature twice.
+ if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -107,23 +117,42 @@ Please remove all Build.PL files and only use the Makefile.PL installer.
END_DIE
+ #-------------------------------------------------------------
+ # To save some more typing in Module::Install installers, every...
+ # use inc::Module::Install
+ # ...also acts as an implicit use strict.
+ $^H |= strict::bits(qw(refs subs vars));
+ #-------------------------------------------------------------
+ unless ( -f $self->{file} ) {
+ foreach my $key (keys %INC) {
+ delete $INC{$key} if $key =~ /Module\/Install/;
+ }
-# To save some more typing in Module::Install installers, every...
-# use inc::Module::Install
-# ...also acts as an implicit use strict.
-$^H |= strict::bits(qw(refs subs vars));
-
+ local $^W;
+ require "$self->{path}/$self->{dispatch}.pm";
+ File::Path::mkpath("$self->{prefix}/$self->{author}");
+ $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
+ $self->{admin}->init;
+ @_ = ($class, _self => $self);
+ goto &{"$self->{name}::import"};
+ }
+ local $^W;
+ *{"${who}::AUTOLOAD"} = $self->autoload;
+ $self->preload;
+ # Unregister loader and worker packages so subdirs can use them again
+ delete $INC{'inc/Module/Install.pm'};
+ delete $INC{'Module/Install.pm'};
+ # Save to the singleton
+ $MAIN = $self;
-use Cwd ();
-use File::Find ();
-use File::Path ();
-use FindBin;
+ return 1;
+}
sub autoload {
my $self = shift;
@@ -136,7 +165,21 @@ sub autoload {
# Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
}
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
+ unless ($$sym =~ s/([^:]+)$//) {
+ # XXX: it looks like we can't retrieve the missing function
+ # via $$sym (usually $main::AUTOLOAD) in this case.
+ # I'm still wondering if we should slurp Makefile.PL to
+ # get some context or not ...
+ my ($package, $file, $line) = caller;
+ die <<"EOT";
+Unknown function is found at $file line $line.
+Execution of $file aborted due to runtime errors.
+
+If you're a contributor to a project, you may need to install
+some Module::Install extensions from CPAN (or other repository).
+If you're a user of a module, please contact the author.
+EOT
+ }
my $method = $1;
if ( uc($method) eq $method ) {
# Do nothing
@@ -152,33 +195,6 @@ sub autoload {
};
}
-sub import {
- my $class = shift;
- my $self = $class->new(@_);
- my $who = $self->_caller;
-
- unless ( -f $self->{file} ) {
- require "$self->{path}/$self->{dispatch}.pm";
- File::Path::mkpath("$self->{prefix}/$self->{author}");
- $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
- $self->{admin}->init;
- @_ = ($class, _self => $self);
- goto &{"$self->{name}::import"};
- }
-
- *{"${who}::AUTOLOAD"} = $self->autoload;
- $self->preload;
-
- # Unregister loader and worker packages so subdirs can use them again
- delete $INC{"$self->{file}"};
- delete $INC{"$self->{path}.pm"};
-
- # Save to the singleton
- $MAIN = $self;
-
- return 1;
-}
-
sub preload {
my $self = shift;
unless ( $self->{extensions} ) {
@@ -204,6 +220,7 @@ sub preload {
my $who = $self->_caller;
foreach my $name ( sort keys %seen ) {
+ local $^W;
*{"${who}::$name"} = sub {
${"${who}::AUTOLOAD"} = "${who}::$name";
goto &{"${who}::AUTOLOAD"};
@@ -214,12 +231,13 @@ sub preload {
sub new {
my ($class, %args) = @_;
+ FindBin->again;
+
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
delete $args{prefix};
}
-
return $args{_self} if $args{_self};
$args{dispatch} ||= 'Admin';
@@ -272,8 +290,10 @@ END_DIE
sub load_extensions {
my ($self, $path, $top) = @_;
+ my $should_reload = 0;
unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
+ $should_reload = 1;
}
foreach my $rv ( $self->find_extensions($path) ) {
@@ -281,12 +301,13 @@ sub load_extensions {
next if $self->{pathnames}{$pkg};
local $@;
- my $new = eval { require $file; $pkg->can('new') };
+ my $new = eval { local $^W; require $file; $pkg->can('new') };
unless ( $new ) {
warn $@ if $@;
next;
}
- $self->{pathnames}{$pkg} = delete $INC{$file};
+ $self->{pathnames}{$pkg} =
+ $should_reload ? delete $INC{$file} : $INC{$file};
push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
}
@@ -149,32 +149,13 @@ sub _wrapped_body {
}
-sub wrap {
- my ($class, %args) = @_;
-
- $args{actual_body} = delete $args{body}
- if exists $args{body};
-
+around wrap => sub {
+ my $orig = shift;
my $self;
- my $to_wrap = $class->_wrapped_body(\$self, %args);
-
-
- if ($args{traits}) {
- my @traits = map {
- Class::MOP::load_class($_->[0]); $_->[0];
- } @{ $args{traits} };
-
- my $meta = Moose::Meta::Class->create_anon_class(
- superclasses => [ $class ],
- roles => [ @traits ],
- cache => 1,
- );
- $meta->add_method(meta => sub { $meta });
-
- $class = $meta->name;
- }
+ my ($class, $code, %args) = @_;
- $self = $class->_new(%args, body => $to_wrap);
+ my $wrapped = $class->_wrapped_body(\$self, %args);
+ $self = $class->$orig($wrapped, %args, actual_body => $code);
# Vivify the type constraints so TC lookups happen before namespace::clean
# removes them
@@ -185,24 +166,7 @@ sub wrap {
if $self->{associated_metaclass};
return $self;
-}
-
-sub reify {
- my ($self, %params) = @_;
- my $trait_args = delete $params{trait_args};
-
- my $clone;
- $clone = $self->meta->clone_object($self,
- %params, @{ $trait_args || [] },
- body => $self->_wrapped_body(\$clone,
- ($self->has_return_signature
- ? (return_signature => $self->return_signature)
- : ()),
- ),
- );
-
- return $clone;
-}
+};
sub _build_parsed_signature {
my ($self) = @_;
@@ -398,15 +362,19 @@ sub _build_type_constraint {
my $i = 0;
for my $param (@{ $positional }) {
- push @positional_args,
+ push @positional_args, map { $coerce_param->($param, $_) }
$#{ $_ } < $i
? (exists $param->{default} ? eval $param->{default} : ())
- : $coerce_param->($param, $_->[$i]);
+ : $_->[$i];
$i++;
}
if (%named) {
- my %rest = @{ $_ }[$i .. $#{ $_ }];
+ my @rest = @{ $_ }[$i .. $#{ $_ }];
+ confess "Expected named arguments but didn't find an even-sized list"
+ unless @rest % 2 == 0;
+ my %rest = @rest;
+
while (my ($key, $spec) = each %named) {
if (exists $rest{$key}) {
$named_args{$key} = $coerce_param->($spec, delete $rest{$key});
@@ -414,7 +382,7 @@ sub _build_type_constraint {
}
if (exists $spec->{default}) {
- $named_args{$key} = eval $spec->{default};
+ $named_args{$key} = $coerce_param->($spec, eval $spec->{default});
}
}
@@ -19,7 +19,7 @@ use aliased 'Devel::Declare::Context::Simple', 'ContextSimple';
use namespace::autoclean;
-our $VERSION = '0.30';
+our $VERSION = '0.31';
has package => (
is => 'ro',
@@ -128,16 +128,25 @@ sub strip_traits {
my $ctx = $self->context;
my $linestr = $ctx->get_linestr;
- unless (substr($linestr, $ctx->offset, 2) eq 'is') {
+ unless (substr($linestr, $ctx->offset, 2) eq 'is' ||
+ substr($linestr, $ctx->offset, 4) eq 'does') {
# No 'is' means no traits
return;
}
my @traits;
- while (substr($linestr, $ctx->offset, 2) eq 'is') {
- # Eat the 'is' so we can call strip_names_and_args
- substr($linestr, $ctx->offset, 2) = '';
+ while (1) {
+ if (substr($linestr, $ctx->offset, 2) eq 'is') {
+ # Eat the 'is' so we can call strip_names_and_args
+ substr($linestr, $ctx->offset, 2) = '';
+ } elsif (substr($linestr, $ctx->offset, 4) eq 'does') {
+ # Eat the 'does' so we can call strip_names_and_args
+ substr($linestr, $ctx->offset, 4) = '';
+ } else {
+ last;
+ }
+
$ctx->set_linestr($linestr);
push @traits, @{ $ctx->strip_names_and_args };
# Get the current linestr so that the loop can look for more 'is'
@@ -145,7 +154,7 @@ sub strip_traits {
$linestr = $ctx->get_linestr;
}
- confess "expected traits after 'is', found nothing"
+ confess "expected traits after 'is' or 'does', found nothing"
unless scalar(@traits);
# Let's check to make sure these traits aren't aliased locally
@@ -189,6 +198,7 @@ sub parser {
die $err if $err;
}
+my $anon_counter = 1;
sub _parser {
my $self = shift;
my $ctx = $self->context;
@@ -212,13 +222,35 @@ sub _parser {
$args{ traits } = $traits if $traits;
$args{ return_signature } = $ret_tc if defined $ret_tc;
+ # Class::MOP::Method requires a name
+ $args{ name } = $name || '__ANON__'.($anon_counter++).'__';
+
if ($self->has_prototype_injections) {
confess('Configured declarator does not match context declarator')
if $ctx->declarator ne $self->prototype_injections->{declarator};
$args{prototype_injections} = $self->prototype_injections->{injections};
}
- my $proto_method = MooseX::Method::Signatures::Meta::Method->wrap(%args);
+ my $meth_class = 'MooseX::Method::Signatures::Meta::Method';
+ if ($args{traits}) {
+ my @traits = ();
+ foreach my $t (@{$args{traits}}) {
+ Class::MOP::load_class($t->[0]);
+ if ($t->[1]) {
+ %args = (%args, eval $t->[1]);
+ };
+ push @traits, $t->[0];
+ }
+ my $meta = Moose::Meta::Class->create_anon_class(
+ superclasses => [ $meth_class ],
+ roles => [ @traits ],
+ cache => 1,
+ );
+ $meth_class = $meta->name;
+ delete $args{traits};
+ }
+
+ my $proto_method = $meth_class->wrap(sub { }, %args);
my $after_block = ')';
@@ -241,11 +273,17 @@ sub _parser {
my $create_meta_method = sub {
my ($code, $pkg, $meth_name, @args) = @_;
subname $pkg . "::" .$meth_name, $code;
- return $proto_method->reify(
- actual_body => $code,
- package_name => $pkg,
- name => $meth_name,
- trait_args => \@args,
+
+ # we want to reinitialize with all the args,
+ # so we give the opportunity for traits to wrap the correct
+ # closure.
+ my %other_args = %{$proto_method};
+ delete $other_args{body};
+ delete $other_args{actual_body};
+
+ my $ret = $meth_class->wrap(
+ $code,
+ %other_args, @args
);
};
@@ -7,6 +7,7 @@ use FindBin;
use lib "$FindBin::Bin/lib";
use TestClass;
+use TestClassWithMxTypes;
dies_ok(sub { TestClass->new });
dies_ok(sub { TestClass->new('moo', 23) });
@@ -71,6 +72,13 @@ dies_ok(sub { $o->without_coercion({}) });
lives_ok(sub { $o->named_with_coercion(foo => bless({}, 'MyType')) });
lives_ok(sub { $o->named_with_coercion(foo => {}) });
+lives_ok(sub { $o->optional_with_coercion() });
+{
+ lives_ok(sub {
+ $o->default_with_coercion()
+ }, 'Complex default with coercion' );
+}
+
# MooseX::Meta::Signature::Combined bug? optional positional can't be omitted
#lives_ok(sub { $o->combined(1, 2, required => 3) });
#lives_ok(sub { $o->combined(1, 2, required => 3, optional => 4) });
@@ -80,4 +88,13 @@ use MooseX::Method::Signatures;
my $anon = method ($foo, $bar) { };
isa_ok($anon, 'Moose::Meta::Method');
+my $mxt = TestClassWithMxTypes->new();
+
+dies_ok(sub { $mxt->with_coercion() });
+lives_ok(sub { $mxt->with_coercion('Str') });
+
+isa_ok( $mxt->with_coercion('Str'), q/Moose::Meta::TypeConstraint/ );
+lives_ok(sub { $mxt->optional_with_coercion() });
+lives_ok(sub { $mxt->optional_with_coercion('Str') });
+
done_testing;
@@ -57,6 +57,9 @@ method without_coercion (MyType $foo) { $foo }
method with_coercion (MyType $foo does coerce) { $foo }
method named_with_coercion (MyType :$foo does coerce) { $foo }
+method optional_with_coercion (MyType $foo? does coerce) { $foo }
+method default_with_coercion (MyType $foo={} does coerce) { $foo }
+
no Moose;
1;
@@ -0,0 +1,27 @@
+use strict;
+use warnings;
+
+package TestClassWithMxTypes;
+
+use Moose;
+use MooseX::Method::Signatures;
+use MooseX::Types::Moose 'Str';
+
+use MooseX::Types -declare => ['TypeConstraint'];
+BEGIN {
+ subtype TypeConstraint, as class_type('Moose::Meta::TypeConstraint');
+ coerce TypeConstraint, from Str, via { find_type_constraint($_) };
+}
+
+method new($class:) { return bless {}, $class }
+
+method with_coercion( TypeConstraint $type does coerce ) {
+ return $type;
+}
+
+method optional_with_coercion( TypeConstraint $type? does coerce ) {
+ return $type;
+}
+
+1;
+
@@ -10,13 +10,13 @@ use MooseX::Method::Signatures::Meta::Method;
use metaclass;
my $method = MooseX::Method::Signatures::Meta::Method->wrap(
- signature => '($class: Int :$foo, Str :$bar)',
- package_name => 'Foo',
- name => 'bar',
- body => sub {
+ sub {
my ($class, $foo, $bar) = @_;
return $bar x $foo;
},
+ signature => '($class: Int :$foo, Str :$bar)',
+ package_name => 'Foo',
+ name => 'bar',
);
::isa_ok($method, 'Moose::Meta::Method');
@@ -0,0 +1,44 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Moose;
+
+{
+ package Bar;
+ use Moose::Role;
+}
+
+{
+ package Baz;
+ use Moose::Role;
+}
+
+{
+ package Foo;
+
+ use Moose;
+ use MooseX::Method::Signatures;
+
+ method bar ($baz) does Bar { $baz }
+ method bla ($baz) does Bar does Baz { $baz }
+ method boo ($baz) does (Bar, Baz) { $baz }
+
+}
+
+my $o = Foo->new;
+
+can_ok($o, 'bar');
+my $method = Foo->meta->get_method('bar');
+does_ok($method, 'Bar');
+
+can_ok($o, 'bla');
+$method = Foo->meta->get_method('bla');
+does_ok($method, 'Bar');
+does_ok($method, 'Baz');
+
+can_ok($o, 'boo');
+$method = Foo->meta->get_method('boo');
+does_ok($method, 'Bar');
+does_ok($method, 'Baz');
+
+done_testing;
@@ -0,0 +1,71 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Exception;
+
+{
+ package Foo;
+ use Moose;
+ use MooseX::Method::Signatures;
+
+ method morning (Str $name) {
+ return "Good morning ${name}!";
+ }
+
+ method hello (Str :$who, Int :$age where { $_ > 0 }) {
+ return "Hello ${who}, I am ${age} years old!";
+ }
+
+ method greet (Str $name, Bool :$excited = 0) {
+ if ($excited) {
+ return "GREETINGS ${name}!";
+ }
+ else {
+ return "Hi ${name}!";
+ }
+ }
+
+ package SomeClass;
+ use Moose;
+ use MooseX::Method::Signatures;
+
+ method foo ( SomeClass $thing where { $_->can('stuff') }:
+ Str $bar = "apan",
+ Int :$baz! = 42 where { $_ % 2 == 0 } where { $_ > 10 } ) { return $bar . ':' . $baz }
+
+ method stuff { }
+
+ # the invocant is called $thing, must be an instance of SomeClass and
+ # has to implement a 'stuff' method
+ # $bar is positional, required, must be a string and defaults to "apan"
+ # $baz is named, required, must be an integer, defaults to 42 and needs
+ # to be even and greater than 10
+}
+
+my $foo = Foo->new;
+
+isa_ok($foo, 'Foo');
+
+lives_and(sub { is $foo->morning('Resi'), 'Good morning Resi!' }, 'positional str arg');
+lives_and(sub { is $foo->hello(who => 'world', age => 42), 'Hello world, I am 42 years old!' }, 'two named args');
+lives_and(sub { is $foo->greet('Resi', excited => 1), 'GREETINGS Resi!' }, 'positional and named args (with named default)');
+throws_ok(sub { $foo->hello(who => 'world', age => 'fortytwo') }, qr/Validation failed/, 'Str, Str sent to Str, Int');
+throws_ok(sub { $foo->hello(who => 'world', age => -23) }, qr/Validation failed/, 'Int violates where');
+throws_ok(sub { $foo->morning }, qr/Validation failed/, 'no required (positional) arg passed');
+throws_ok(sub { $foo->greet }, qr/Validation failed/, 'no required (positional) arg passed');
+
+my $someclass = SomeClass->new;
+
+isa_ok($someclass, 'SomeClass');
+
+lives_and(sub { is $someclass->foo, 'apan:42' }, '$someclass->foo');
+lives_and(sub { is $someclass->foo('quux'), 'quux:42' }, '$someclass->foo("quux")');
+lives_and(sub { is $someclass->foo('quux', baz => 12), 'quux:12' }, '$someclass->foo("quux", baz => 12)');
+
+throws_ok(sub { $someclass->foo(baz => 12) }, qr/Expected named arguments/, '$someclass->foo(baz => 12)');
+throws_ok(sub { $someclass->foo(baz => 12, 'quux') }, qr/Validation failed/, '$someclass->foo(baz => 12, "quux")');
+throws_ok(sub { $someclass->foo(baz => 41) }, qr/Expected named arguments/, '$someclass->foo(baz => 41)');
+throws_ok(sub { $someclass->foo(baz => 44) }, qr/Expected named arguments/, '$someclass->foo(baz => 12)');
+
+
+done_testing;
@@ -0,0 +1,30 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Exception;
+
+{
+ package Foo;
+ use Moose;
+ use MooseX::Method::Signatures;
+
+ method m1(:$bar!) { }
+ method m2(:$bar?) { }
+ method m3(:$bar ) { }
+
+ method m4( $bar!) { }
+ method m5( $bar?) { }
+ method m6( $bar ) { }
+}
+
+my $foo = Foo->new;
+
+lives_ok(sub { $foo->m1(bar => undef) }, 'Explicitly pass undef to positional required arg');
+lives_ok(sub { $foo->m2(bar => undef) }, 'Explicitly pass undef to positional explicit optional arg');
+lives_ok(sub { $foo->m3(bar => undef) }, 'Explicitly pass undef to positional implicit optional arg');
+
+lives_ok(sub { $foo->m4(undef) }, 'Explicitly pass undef to required arg');
+lives_ok(sub { $foo->m5(undef) }, 'Explicitly pass undef to explicit required arg');
+lives_ok(sub { $foo->m6(undef) }, 'Explicitly pass undef to implicit required arg');
+
+done_testing;
@@ -0,0 +1,57 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Exception;
+
+{
+ package Foo::Bar;
+ use Moose;
+ has baz => (isa => 'Str', default => 'quux', is => 'ro');
+
+ package Foo;
+ use Moose;
+ use MooseX::Method::Signatures;
+
+ method m1(Str $arg where { $_ eq 'foo' }) { $arg }
+ method m2(Int $arg where { $_ == 1 }) { $arg }
+ method m3(Foo::Bar $arg where { $_->baz eq 'quux' }) { $arg->baz }
+
+ method m4(Str :$arg where { $_ eq 'foo' }) { $arg }
+ method m5(Int :$arg where { $_ == 1 }) { $arg }
+ method m6(Foo::Bar :$arg where { $_->baz eq 'quux' }) { $arg->baz }
+
+ method m7($arg where { 1 }) { }
+ method m8(:$arg where { 1 }) { }
+
+ method m9(Str $arg = 'foo' where { $_ eq 'bar' }) { $arg }
+}
+
+my $foo = Foo->new;
+
+isa_ok($foo, 'Foo');
+
+lives_and(sub { is $foo->m1('foo'), 'foo' }, 'where positional string type');
+throws_ok(sub { $foo->m1('bar') }, qr/Validation failed/, 'where positional string type');
+
+lives_and(sub { is $foo->m2(1), 1 }, 'where positional int type');
+throws_ok(sub { $foo->m2(0) }, qr/Validation failed/, 'where positional int type');
+
+lives_and(sub { is $foo->m3(Foo::Bar->new), 'quux' }, 'where positional class type');
+throws_ok(sub { $foo->m3(Foo::Bar->new({ baz => 'affe' })) }, qr/Validation failed/, 'where positional class type');
+
+lives_and(sub { is $foo->m4(arg => 'foo'), 'foo' }, 'where named string type');
+throws_ok(sub { $foo->m4(arg => 'bar') }, qr/Validation failed/, 'where named string type');
+
+lives_and(sub { is $foo->m5(arg => 1), 1 }, 'where named int type');
+throws_ok(sub { $foo->m5(arg => 0) }, qr/Validation failed/, 'where named int type');
+
+lives_and(sub { is $foo->m6(arg => Foo::Bar->new), 'quux' }, 'where named class type');
+throws_ok(sub { $foo->m6(arg => Foo::Bar->new({ baz => 'affe' })) }, qr/Validation failed/, 'where named class type');
+
+lives_ok(sub { $foo->m7(1) }, 'where positional');
+lives_ok(sub { $foo->m8(arg => 1) }, 'where named');
+
+lives_and(sub { is $foo->m9('bar'), 'bar' }, 'where positional string type with default');
+throws_ok(sub { $foo->m9 }, qr/Validation failed/, 'where positional string type with default');
+
+done_testing;
@@ -0,0 +1,49 @@
+use Test::More;
+use Test::Moose;
+
+{ package MyClass;
+ use Moose;
+ use MooseX::Method::Signatures;
+ use aliased 'MooseX::Meta::Method::Transactional';
+ use aliased 'MooseX::Meta::Method::Authorized';
+
+ has user => (is => 'ro');
+ has schema => (is => 'ro');
+
+ # this was supposed to die, but the trait is not really applied.
+ method m01 does Transactional does Authorized(requires => ['foo']) { 'm01' }
+ method m02 does Transactional { 'm02' }
+ method m03 does Authorized(requires => ['gah']) { 'm03' }
+ method m04 does Transactional does Authorized(requires => ['gah']) { 'm01' }
+
+};
+{ package MySchema;
+ use Moose;
+ sub txn_do {
+ my $self = shift;
+ my $code = shift;
+ return 'txn_do '.$code->(@_);
+ }
+};
+{ package MyUser;
+ use Moose;
+ sub roles { qw<foo bar baz> }
+};
+
+my $meth = MyClass->meta->get_method('m01');
+my $obj = MyClass->new({user => MyUser->new, schema => MySchema->new });
+
+is($obj->m01, 'txn_do m01', 'applying both roles work.');
+is($obj->m02, 'txn_do m02', 'Applyign just Transactional');
+eval {
+ $obj->m03;
+};
+like($@.'', qr(Access Denied)i, $@);
+
+eval {
+ $obj->m04;
+};
+like($@.'', qr(Access Denied)i, $@);
+
+done_testing();
+1;